From 0c94c34d70069d03f57a8bf6df6e6880f8aa96f2 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 3 Dec 2005 03:22:06 +0000
Subject: [PATCH] Do the same enclosure quoting hack on input for MXF.

---
 gpsbabel/csv_util.c        | 8 ++++++--
 gpsbabel/internal_styles.c | 4 ++--
 gpsbabel/style/mxf.style   | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index 00be882f0..e7299f667 100644
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -752,6 +752,10 @@ time_to_yyyymmdd(time_t t)
 static void
 xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp)
 {
+    char *enclosure = "";
+    if (0 == strcmp(fmp->printfc, "\"%s\"")) {
+	enclosure = "\"";
+    }
     if (strcmp(fmp->key, "IGNORE") == 0) {
        /* IGNORE -- Categorically ignore this... */
     } else
@@ -765,10 +769,10 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp)
        /* IGNORE -- Calculated Sequence # For Ouput*/
     } else
     if (strcmp(fmp->key, "SHORTNAME") == 0) {
-       wpt->shortname = csv_stringtrim(s, "", 0);
+       wpt->shortname = csv_stringtrim(s, enclosure, 0);
     } else
     if (strcmp(fmp->key, "DESCRIPTION") == 0) {
-       wpt->description = csv_stringtrim(s, "", 0);
+       wpt->description = csv_stringtrim(s, enclosure, 0);
     } else
     if (strcmp(fmp->key, "NOTES") == 0) {
        wpt->notes = csv_stringtrim(s, "", 0);
diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c
index e1724fe13..fabd988a9 100644
--- a/gpsbabel/internal_styles.c
+++ b/gpsbabel/internal_styles.c
@@ -463,8 +463,8 @@ static char mxf[] =
 "#\n"
 "IFIELD	LAT_DECIMAL, \"\", \"%08.5f\"\n"
 "IFIELD	LON_DECIMAL, \"\", \"%08.5f\"\n"
-"IFIELD	DESCRIPTION, \"\", \"%s\"\n"
-"IFIELD	SHORTNAME, \"\", \"%s\"\n"
+"IFIELD	DESCRIPTION, \"\", \"\"%s\"\"\n"
+"IFIELD	SHORTNAME, \"\", \"\"%s\"\"\n"
 "IFIELD	IGNORE, \"\", \"%s\"\n"
 "IFIELD	CONSTANT, \"ff0000\", \"%s\"	# COLOR\n"
 "IFIELD	CONSTANT, \"47\", \"%s\"		# ICON\n"
diff --git a/gpsbabel/style/mxf.style b/gpsbabel/style/mxf.style
index 606f40bb3..08d35e7d6 100644
--- a/gpsbabel/style/mxf.style
+++ b/gpsbabel/style/mxf.style
@@ -24,8 +24,8 @@ BADCHARS		,"
 #
 IFIELD	LAT_DECIMAL, "", "%08.5f"
 IFIELD	LON_DECIMAL, "", "%08.5f"
-IFIELD	DESCRIPTION, "", "%s"
-IFIELD	SHORTNAME, "", "%s"
+IFIELD	DESCRIPTION, "", ""%s""
+IFIELD	SHORTNAME, "", ""%s""
 IFIELD	IGNORE, "", "%s"
 IFIELD	CONSTANT, "ff0000", "%s"	# COLOR
 IFIELD	CONSTANT, "47", "%s"		# ICON
-- 
2.30.2